Merge "Fixes crash when launching app pairs with intent+intent" into main