Merge "ICS updates to notification layouts."