Merge "Introduce watch and multiple device icon" into tm-dev