first draft. Needs testing: seems to break mobile=>desktop transition
Merge branch 'master' into android_fix
wrap in android-only tests
MIT license
Merge branch 'android_fix'