Merge changes from topic "scheduler_fps" into qt-dev

* changes:
  SurfaceFlinger: use std::set for DisplayConfigs
  SurfaceFlinger: better fit content to refresh rate
  SurfaceFlinger: handle wallpaper scenario in Scheduler
  SF: Updating content FPS tracking