Merge changes from topic "am-7be3af44-066d-47ef-8317-5b07072f0a58" into ub-launcher3-master

* changes:
  [automerger] Fix a couple issues with swiping up from home am: 7de574175b
  Fix a couple issues with swiping up from home