Merge changes from topic "vendor-display-settings"

* changes:
  Add global development setting to enable/disable vendor display settings. (2/n)
  Seperate out DisplayWindowSettings persistence from retreival/policy logic. (1/n)