Merge "Surface: Ensure synchronisation of copyBlt" am: 88f77814a1 am: 5a2dcde971
am: 11d80ae93e

Change-Id: I955ce5a325d6dd2fbc42eaeb59c37a07aa1c9a6b