Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev