Merge "Avoid keyboard changes leading to Activity relaunch" into android11-tests-dev