am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev

* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails