Merge changes from topic "am-b3cd6b2d-5e4c-4d1d-916b-d7a7d446e951" into ub-launcher3-master

* changes:
  [automerger] Fix issue with z order layering am: 90749604f4
  Fix issue with z order layering