Merge "heif: add new file and mime types to MediaScanner -- DO NOT MERGE" into oc-mr1-dev