Merge "SlidingPaneLayout: Preserve GONE visibility"