Keyboard: clean up unused variable left over from development
Keyboard refactor: fix regression w/ tree navigation

Make sure to skip over children under re-collapsed parents