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

Change-Id: I8c2b03438fdeed6bce12489c5639245b79097577