Merge "Fix build - update references to Window & View classes"