Hygiene: Move I click the watch star to appropriate home

Address this QA FIXME

Change-Id: Id545da81502556d52919788b2f855933b5cfb406
Merge "Hygiene: Move I click the watch star to appropriate home"