Merge "Prevent Activity relaunch by other config changes" into android13-tests-dev