Merge "Fixing enter desktop transition bug" into main