Merge "Only create surface when showing window if it destroys it when hiding."