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

* commit '15bb16fb48f523b6b0d8c03cfe5988096341e29d':
  App linking: permit overlapping link handling