minor Android TV fixes
Move some stuff to common