Merge "Enables opt-in strict intent resolution for apps" into main