Merge "Clear TextView focus on escape key press" into main