Merge "Rename Uri.normalize() to Uri.normalizeScheme()." into jb-dev