Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom