Merge changes from topic "am-e4fc8b63-7d30-48ba-8bff-555d9e7e1860" into ub-launcher3-master

* changes:
  [automerger] Chaniging all-apps scrim am: 927447e71d
  Chaniging all-apps scrim