Merge "Remove Windowing Prototype 1 from Codebase" into main