Merge "SurfaceControl: Fix Global Transaction locking error."