Merge "Exit to Settings when removing the only account for a type." into jb-dev