Merge "Don't immediately show keyboard in edit screen"