Merge changes from topic "am-bb95dae2-253e-4760-b81b-d40b934646da" into ub-launcher3-master

* changes:
  [automerger] Adding scrim in all-apps scrim am: 81a70e5dc2
  Adding scrim in all-apps scrim