Merge changes from topic "new-caret" into ub-launcher3-master

* changes:
  [automerger] Adding a carent in the scrim am: ef39540dde
  Adding a carent in the scrim