Merge "Remove obsolete desktop stashing for Desktop Windowing [4/n]" into main