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

Change-Id: Idb9b4c65846d3b37bb7920f49712d16a0668ceb0