Merge "Notification: Reuse drawable in Header if Icon unchanged" into nyc-mr1-dev