Merge "2-pane: Make sure to hide "edit contact" on non "all" tabs"