Merge "Notification & settings panel redesign." into honeycomb