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