Merge "Prevent activity being destroyed immediately if embedded" into sc-v2-dev