Merge "Don't include invisible transientlaunches in transitions" into main