Third batch of fixes for non-Gemini devices and additional support for tablets