Merge pull request #40161 from bernhardoj/fix/40034-flicker-when-reop… #13966

Job	Run time
typecheck / typecheck	2m 6s
lint / Run ESLint	6m 17s
test / test (job 1)	1m 16s
test / test (job 2)	47s
test / Storybook tests	1m 40s
test / test (job 3)	1m 13s
test / Shell tests	1m 26s
confirmPassingBuild	6s
chooseDeployActions	12s
skipDeploy	2s
createNewVersion	0s
e2ePerformanceTests / Build apk from latest release as a baseline	40s
e2ePerformanceTests / Build apk from delta ref	30m 36s
updateStaging	0s
e2ePerformanceTests / Run E2E tests in AWS device farm	27m 57s
	1h 14m 18s

Provide feedback