Show extended watchlist if user has such in preference

Change-Id: I3c964950237b073e737048b39bbf78d9e0f02a7e
Merge "Show extended watchlist if user has such in preference" into frontend-rewrite