Merge "Clear accounts after cursors are closed"