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

Change-Id: I51ee1d27e136d2e5be4ecfa29892125debefe80c