am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev

* commit 'bf463af2a5ed6c37df5d0e5a49f6a15d457e1c85':
  Surface:lockHardwareCanvas