Merge "Controls - Handle launching/back from activities" into sc-dev