Merge "b/3154082 Update Notification to new ui" into honeycomb