Merge changes from topic "am-11851312-e665-4de2-88e4-10cb14f31d5f" into ub-launcher3-master

* changes:
  [automerger] Fix lock contention while swiping up am: 570432f700
  Fix lock contention while swiping up