Merge "Surface: Use async lock/unlock in copyBlt" am: b73de86f13
am: e29dda829d

Change-Id: I753acee7ab8f0c0ca62a5606ae1b5c44e2314fd3