Merge \"Clean up surfaces when app is resumed without being stopped.\" into nyc-mr1-dev
am: e86da3bc62

Change-Id: Ifae55b72ab9d1310a9647ef8a0c3ee2c4e49b055