Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev am: cf6885b7b7 am: c783ebc13a
am: ea2e422c23

* commit 'ea2e422c2381298b67f3ce81d01b454e85dbe269':
  Avoid drawable invalidation during draw()