Merge "Enables keyboard option by default." into tm-dev