Merge "Fix launcher activity leaking when desktop windowing enabled" into main