Merge "Revert "Make enhanced recent changes and extended watchlist default""