Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev