Merge "Don't release surface if relayout is visible" into nyc-mr1-dev