Merge "Code cleaning for NotificationStation" into lmp-dev