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

Change-Id: Ifb17a3d79f367bf22e01746209453f8b36bb35b5