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

Change-Id: Ie58e90151f9cb0bdcf9fb465b2d931481e63f7cc