Disable HW acceleration for Samsung Galaxy SII Plus (#4265)
Merge branch 'release' into upstream