Merge "Migrate buffers during surface change" into qt-dev am: 5ff7ff550b
am: 31a81a3517

Change-Id: I1c4de5cbed36cacbcff21b7ed9cd38cd34d1348e