Merge "Enable account switcher in contact creation"