Merge "Fix sharesheet permissioned icon loading bug"