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

Change-Id: I49d1f1e08d9b917f4ba83316d7e6a37f42b72c8f