Merge "SurfaceFlinger: frame rate heuristic during config change" into rvc-dev