Merge "[flexiglass] Fixes issue where user management settings didn't show" into main