Merge "Surfaceflinger: adjust content detection fps selection" into qt-r1-dev