Merge "Further improve load order of RC and watchlist styling"