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