Merge "Use activity instead of fragment as lifecycle owner" into udc-dev