Merged Android 4.3.1 and Fixed MMS