Merge "Use baseIntent's componentInfo to supply Icon for Enter-Desktop." into main