Revert "Revert "Adding a separate state for QuickScrub""

This reverts commit 2687257c9881f44243924db7a064cff4f59fcc1b.

Reason for revert: Reverting post-build

Change-Id: Ic3a1e8ed84a227b42bc35b91d4f0eed60bb2e29c
13 files changed