Merge "Fix a NPE when removing accounts." into qt-dev