Merge "Surface: Use async lock/unlock in copyBlt"