Merge "SurfaceView: Fix unsafe transaction accesses"