Merge pull request #39875 from allroundexperts/fix-37736 #15795

Job	Run time
typecheck / typecheck	3m 13s
test / Storybook tests	4m 20s
test / test (job 1)	2m 23s
lint / Run ESLint	10m 21s
test / test (job 2)	2m 29s
test / test (job 3)	2m 28s
confirmPassingBuild	6s
chooseDeployActions	7s
skipDeploy	5s
createNewVersion	0s
updateStaging	0s
e2ePerformanceTests / Build apk from latest release as a baseline	12s
e2ePerformanceTests / Build apk from delta ref	7m 12s
e2ePerformanceTests / Run E2E tests in AWS device farm	0s
	32m 56s

Provide feedback