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

Change-Id: I47d834d26cee248900d268bbe027ea82fd7c286a