Merge "Streamline activity start flow"