(bug 25325) fix wlexcludeuser for ApiFeedWatchlist

The effect of setting this option was later overwritten in the code; I
just moved an if a few lines down.

Also some null comparison cleanup.

Change-Id: I2a85673330681c6ff7facc25a7bbfb6972fe8fd5
Merge "(bug 25325) fix wlexcludeuser for ApiFeedWatchlist"