Honor the no images setting on watchlist

Change-Id: I0e2884d793e39b81736150f2bd186b68fb0bec11
Merge "Honor the no images setting on watchlist"