Merge "Clean up out of date logic for starting activity"