Merge "Avoid drawable invalidation during draw()"