Merge "SurfaceFlinger: do not choose POWER_SAVING as refresh rate"