Merge "Fix 3381304: disable key preview in LockScreen's qwerty keyboard" into honeycomb