am 31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom

* commit '31f971b57f526e2688241080b30c7e8df33bf62d':
  Properly adding scrubber pressed/selected state