Merge "Support ContentResolver#insert for files in external media directory" into rvc-dev