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

Change-Id: Ia19c62e34dc1c64be600641c31f9825b1fe0e788