Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am: 9980514ee0

Change-Id: Icdd46a5b4735f04d8e82cd5ffb34bfd9066a431f