Merge changes from topic "b:140112642:5" into qt-surfaceflinger-dev

* changes:
  SurfaceFlinger: correct negative offset when refresh rate changes
  SurfaceFlinger: add allowed display configs to dumpsys
  Surfaceflinger: adjust content detection fps selection