Merge "Use a public media content uri for viewing local media files" into klp-dev