Merge "SurfaceView: Clean up synchronized changes with applyTransactionOnVriDraw"