Merge "Removing deprecated watcher ui. Renaming v2 to original name. Changed script to match original." into main