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

Change-Id: Ia24595b770e1119ce2d33410d65642430e32fa0e