Merge "Add external_storage.cross_user.enabled property"