Cherry pick from 650e5b177a: Added start of new updater for new view