Merge changes from topic "r3_flicker_master"

* changes:
  Allow DeviceConfig to change display settings for high zone
  Set fixed fps when ambient or display brightness is high