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