Merge "Disable soft keyboard when keyboard attached." into honeycomb