Merge "Revert change to non-profile user badged icon"