Merge "Remove obsolete desktop stashing for Desktop Windowing." into main