Merge "Add extra IApp types and AppLinkInfo APIs"