Merge "Bring back the 'more notifications' icon." into ics-mr1