Merge "Add tablet-specific version of string" into tm-dev