Merge "Move mNotificationActivityStarter + logic to Controller" into sc-v2-dev