Merge "Make fragment the owner of the view model" into udc-dev