Merge "Prevent TextView refocus on escape key press" into main