Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev