Merge branch 'cleanup-tunnel-state-transitions' into main #7617

Job	Run time
Prepare	6s
Generate relay list	2m 21s
Build native (x86_64, x86_64, x86_64-linux-android)	5m 32s
Build native (i686, x86, i686-linux-android)	5m 53s
Build native (aarch64, arm64-v8a, aarch64-linux-android)	6m 26s
Build native (armv7, armeabi-v7a, armv7-linux-androideabi)	6m 45s
Build app and run unit tests	15m 52s
Run instrumented tests (app)	3m 41s
Run instrumented tests (mockapi)	22m 17s
	1h 8m 53s

Provide feedback