Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom