Merge "Revert "Expose the ability to resolve icon as a different app""