Merge "Disable search key press on 1-pane detail/editor activities"