Merge "Add and update cross device sync data holders" into udc-dev