Merge "Fix #2443881 (Don't display User name field for EAS account)"