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

Change-Id: I51cbaf932b7dac50a2fd246d47f3fb69cd421c27