Merge changes I73bb98a0,Ie545c3b6

* changes:
  Extend DrawableWrapper to set tint and alpha
  Fix colors of thick brightness slider