Use old style fullscreen for Android and remove duplicate code

Closes #1286