Merge "SideBySide2: Keep content visible when showing dialogs and popdowns"