Merge "SurfaceFlinger: fix calculation issues with refresh rate selection"