Merge "make sure mSurfaceLock.unlock can be executed in unlockCanvasAndPost"