SpecialWatchlist: Synchronise some code with newer versions from RC

Change-Id: Ia6b883330083d05f7edbb6c2a36cb7e54463d05f