Merge "Remove obsolete desktop stashing logic [3/n]" into main