Merge "Stop showing software keyboard when appropriate"