Merge change 7097 into donut

* changes:
  Fix to use DP instead of pixels for Thumb drawable size.