merge main and solve conflicts #19

Job	Run time
Bump build version (exp) / generate-build-version / generate-build-version	5s
Bump build version (exp) / bump-version	1m 7s
Bump build version (rc)	1m 10s
Nightly exp build (main-exp) / prepare	3m 29s
Nightly exp build (main-exp) / update-build-version	0s
Nightly RC build (main-rc) / update-build-version	0s
Nightly RC build (main-rc) / prepare	3m 27s
Nightly exp build (main-exp) / Setup Dependencies (android) / Setup Node Modules (android)	4m 2s
Nightly exp build (main-exp) / Setup Dependencies (ios) / Setup Node Modules (ios)	4m 27s
Nightly RC build (main-rc) / Setup Dependencies (android) / Setup Node Modules (android)	4m 16s
Nightly RC build (main-rc) / Setup Dependencies (ios) / Setup Node Modules (ios)	4m 24s
Nightly exp build (main-exp) / build (android)	23m 44s
Nightly exp build (main-exp) / build (ios)	14m 20s
Nightly RC build (main-rc) / build (android)	26m 37s
Nightly RC build (main-rc) / build (ios)	14m 19s
Upload exp to TestFlight	8m 10s
Upload RC to TestFlight	5m 46s
	1h 59m 23s

Provide feedback