Limited scope of toggle fix to Android 4.2