Merge changes from topic "desktop-windowing-flags" into tm-qpr-dev

* changes:
  SysUI flags to support desktop windowing proto
  Update flag constant for caption on shell