Merge "Avoid activity embedding if the activity is already embedded" into udc-dev