Merge changes from topic 'am-9a69b851-360f-46eb-9a97-9f3b6fb5a05d' into ub-launcher3-master

* changes:
  [automerger] Defer some work until after workspace fade-in am: 2917a8bf2b
  Defer some work until after workspace fade-in