Merge "Fix issue with quickscrub not getting reset when the state changes"