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