Bring watch star css/html markup closer to desktop

Change-Id: I4d67fd48586541e0f11c15f0088e3a2126221d71
Merge "Bring watch star css/html markup closer to desktop"