Merge "Fix NotificationStation theming" into lmp-dev