Move Android version check to main activity