Merge "Use platform assets for brightness scrubber." into ics-mr1