Merge "Fix NPE in SyncManager when updating accounts." into qt-dev