Merge "[MediaProvider] fix -Wreorder-init-list"