Merge "Enter key unfocuses input fields." into main