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

Change-Id: I86a40d4016d185fee5f45e2bb69cbf0814d9fbeb