Merge "MMS: Disable Android 4.2 specific hack regarding keyboard behavior." into cm-11.0