Merge "Migrate buffers during surface change" into qt-dev am: 5ff7ff550b am: e4a8f66ea6
am: 10d8c128cf

Change-Id: I8a069139f415a5426b8ecbb0270534d1d9f519fa