Merge changes from topic "am-337c344f-ec88-4e4e-9ad7-07a92571f781" into ub-launcher3-master

* changes:
  [automerger] Remove discovery bounce for demo users am: 3993348043
  Remove discovery bounce for demo users