am 140e79bb: Merge "Workaround for small icons. Draw icon drawables at the expected icon size. (Bug 11203738)" into jb-ub-now-indigo-rose

* commit '140e79bb48f6639f2d58c729d6f2597bda0a51b1':
  Workaround for small icons. Draw icon drawables at the expected icon size. (Bug 11203738)