[stable30] fix(settings): Handle email change restriction separately from display name change restriction

[stable30] fix(settings): Handle email change restriction separately from display name change restriction #16222