Make watchlist stars appear on watchlist (regression)

Change-Id: Ied8289d4ee13b2b8608f821bda16f1c1da316aab
Merge "Make watchlist stars appear on watchlist (regression)"