Merge changes from topic "am-c5545bb3-b4fc-4188-890e-09975d70878c" into ub-launcher3-master

* changes:
  [automerger] Immediate 2nd quickscrub should not cancel if same state am: f8fafa2847
  Immediate 2nd quickscrub should not cancel if same state