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

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