Merge "Compare intent filter when launching adjacent" into nyc-dev