Merge "SurfaceFlinger: make sure VsyncPredictor always maintains a valid slope"