Merge \\"Don\\'t release surface if relayout is visible\\" into nyc-mr1-dev am: 465376c5ae
am: 8e8c07cd2e

Change-Id: Icbd15f921c450c4951f6cfaa345c1746e560600c