Merge "Fix AppSearchShortcutInfoTest" into tm-dev