Merge "Fixed the IllegalStateException on removing account" into qt-dev
am: 5a69fac694

Change-Id: I085502786e8883c7ffb346592bfebc1a3bb08209