Merge changes I4649483a,I890a45e6,I6ccfab86 into ub-launcher3-master

* changes:
  17.5/ Remove synchronized calls, verify controller before finishing animation
  17/ Update activity tracker callback
  16/ Renaming the swipe handlers