Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev