Merge "Make sure profile badging matches shape" into main