Merge "Manage drawable invalidation automatically for Overlays" into jb-mr2-dev