Merge "Always show virtual keyboard in test." into tm-dev