Merge "Mutate scroll bar drawables" into lmp-mr1-dev