Merge "Ensure URIs have content:// scheme in WPM" into klp-dev