am 647e0df0: Merge "Surface: Leave object in unlocked state when...
am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
* commit '647e0df0':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails