[#33375] Simplify code in edit contact view (Fix #3207)
Merge remote-tracking branch 'origin/staging' into staging