Merge "SurfaceFlinger: no app vsyncs during config switch"