am 5855c0ca: Merge "Adding selected state for scrubber control" into ics-factoryrom

* commit '5855c0ca68de7103e59e4a6e6996fba528cabd9a':
  Adding selected state for scrubber control