am 218148f1: Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom

* commit '218148f1ffb574282bdc72a1a4cc97b7129cf043':
  Revert "Adding selected state for scrubber control"