Merge "Notification icons: Correctly apply color filter for DrawableContainers" into nyc-mr1-dev