Alternative fix for issue 5697 - ASUS display bug
Don't crash when startActivity() fails

Fixes issue 6201
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into marshell