Use the same logic for sub-accounts as for main accounts when they are closed but should be shown in the account selection process. (cherry picked from commit 138a8629)
