Merge "StatusBarNotification cleanup."