Merge "Add media permissions to STORAGE_PERMISSIONS" into tm-dev