Merge "Avoid starting window being stuck while launch transient launch." into main