Merge changes from topic "demoMode" into ub-launcher3-master

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