am: 105108209f * commit '105108209fc35b5029e5a728c09f6eaf91b8a940': Revert "Avoid drawable invalidation during draw()"