Merge pull request #4698 from opengisch/backport-4696-to-release-3_0 #5911

Job	Run time
build (arm64-android, android_arm64_v8a, OFF)	13m 25s
build (arm64-android, android_arm64_v8a, ON)	13m 21s
build (arm-neon-android, android_armv7, OFF)	14m 21s
build (arm-neon-android, android_armv7, ON)	12m 43s
build (x64-android, android_x86_64, OFF)	12m 56s
build (x64-android, android_x86_64, ON)	15m 2s
build (x86-android, android_x86, OFF)	13m 4s
build (x86-android, android_x86, ON)	14m 4s
comment (commit)	7s
comment (pr)	0s
deploy to play store	0s
	1h 49m 3s

Provide feedback