Merge pull request #42516 from dragnoir/42297-fix #15152

Job	Run time
typecheck / typecheck	1m 53s
lint / Run ESLint	7m 37s
test / Storybook tests	1m 57s
test / test (job 1)	59s
test / Shell tests	1m 12s
test / test (job 2)	55s
test / test (job 3)	1m 27s
confirmPassingBuild	6s
chooseDeployActions	7s
skipDeploy	2s
createNewVersion	0s
updateStaging	0s
e2ePerformanceTests / Build apk from latest release as a baseline	49s
e2ePerformanceTests / Build apk from delta ref	27m 23s
e2ePerformanceTests / Run E2E tests in AWS device farm	34m 8s
	1h 18m 35s

Provide feedback