Merge "Fix small issues with event flow for quickscrub"