Merge "Account: Fix the risk of sqliteconnection leak"