Merge changes I718d3e64,Idd015077

* changes:
  Fix issue with quickswitch happening after recents animation starting
  Handle both touch flows to start quickscrub