Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev