Merge "Revert "Revert "Adds generic intent Instant App resolution"""