am 42e511d6: am a1314983: am 7f25ad62: am 15bb16fb: Merge "App linking: permit overlapping link handling" into mnc-dev

* commit '42e511d6c7be0762b887baa921123ece253e7815':
  App linking: permit overlapping link handling