Merge "Snap desktop window to valid area on display rotate" into main