Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am: 42147f0ff3
am: 83972553b4

Change-Id: I1f44567347b7364dfd545cb75a8db43ee1a047f7