Merge "Fixed display name not saved after carrier changed" into qt-dev