Merge "Add switch for readonly watchlists"