Disable HW acceleration for HTC One S (#4265)
Disable HW acceleration for Android < 4.2 (#4265)
Change the preference key for hardware acceleration (#4265)
Merge branch 'release' into upstream