Merge "Don't compare intent filters on singleTask adjacent launch" into nyc-dev