Merge "Adjust size of badge on managed user." into sc-v2-dev