Merge "SurfaceView: Fix unsafe transaction accesses" into sc-v2-dev