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

* commit '7f25ad62b0fff3fcce0ce78461ac7b46701da78a':
  App linking: permit overlapping link handling