Improve the fix on Xperia devices using Android 4.1.2