Merge "Respect hierarchy visibility of transient launch" into main