Merge "Cancelling quickscrub state incease we missed quickscrub end event" into ub-launcher3-edmonton