Merge changes I37a9dd3e,I6a386626 into ub-launcher3-master

* changes:
  Don't start task from quickswitch until scrolling finishes
  Fix flicker near end of quick switch