Merge "Fix keyboard hidden states." into honeycomb