Fix for Android 2.3 NPE bug; Fix for Kindle HDX