Merge changes from topic "demoModeTopic" into ub-launcher3-dorval-polish2

* changes:
  [automerger] Demo mode default layout support am: 2782449da6
  Demo mode default layout support