Adding a separate state for QuickScrub

Bug: 74014237
Change-Id: Ie86ac589f0ad0e1470fb6b0b71263ec6593eb1e3
13 files changed