Merge pull request #37668 from dragnoir/37417-fix #13110

Job	Run time
typecheck / typecheck	1m 21s
lint / Run ESLint	4m 37s
test / Storybook tests	2m 49s
test / test (job 1)	1m 0s
test / test (job 2)	47s
test / Shell tests	1m 33s
test / test (job 3)	1m 11s
confirmPassingBuild	5s
chooseDeployActions	6s
skipDeploy	2s
createNewVersion	0s
e2ePerformanceTests / Build apk from latest release as a baseline	39s
e2ePerformanceTests / Build apk from delta ref	16m 58s
updateStaging	0s
e2ePerformanceTests / Run E2E tests in AWS device farm	33m 19s
	1h 4m 27s

Provide feedback