I tested using my repro steps above and can confirm this is fixed! Nice job! This was a hairy one.
I did have a minor scare because the first time I looked at the profile as admin the fields were not displayed. But upon browser refresh they appeared. ![]()