Merge "Fixing custom content provider URIs for cloned user." into main