Merge "Fixed the IllegalStateException on removing account" into qt-dev