Merge changes from topic "am-fd839b47-104b-4f3a-a517-fd305a9a6445" into ub-launcher3-master

* changes:
  [automerger] Don't intercept above shelf progress if still animating am: 89126653cd
  Don't intercept above shelf progress if still animating