Merge pull request #39924 from dragnoir/37464-fix #13959

Job	Run time
typecheck / typecheck	1m 41s
lint / Run ESLint	6m 17s
test / test (job 1)	59s
test / test (job 2)	57s
test / test (job 3)	1m 17s
test / Storybook tests	1m 45s
test / Shell tests	1m 20s
confirmPassingBuild	6s
chooseDeployActions	11s
skipDeploy	2s
createNewVersion	0s
e2ePerformanceTests / Build apk from delta ref	30m 45s
e2ePerformanceTests / Build apk from latest release as a baseline	1m 6s
updateStaging	0s
e2ePerformanceTests / Run E2E tests in AWS device farm	28m 37s
	1h 15m 3s

Provide feedback