make sure we don't hide edit tab if it's the same as view tab

If we're switching to edit mode and the current active edit tab is the
same as the active view tab then don't hide the edit tab
Merge remote-tracking branch 'origin/master'