Merge "Fix 3355957: Don't hide the keyboard for PIN/Password" into honeycomb