Merge "SurfaceFlinger: tune FPS detection logic" into qt-r1-dev