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

Change-Id: I3c4674551a61793beb4ec83d10f2c5d6267b8938