Merge "Fix snap window string comment" into main