Merge "Fix navigation and focus issues in RawContactEditorView"