Merge "Collect activity starting logic into ActivityStarter class."