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

Change-Id: I5181d05aab877b22fe4ec52eb2421d11f7de6c3f