Merge "Merge \\"Don\\'t call surfaceCreated for just changed surfaces\\" into nyc-dev am: e4b1fb94e3 am: b8dac11e5a" into nyc-mr1-dev-plus-aosp