Merge "Updates NotificationInfo layout/buttons."