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

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