Merge "Add new API to allow app to opt out Intent Redirect Prevention" into main