Merge "Remove system user from displaying in Storage Settings in HSUM"