Merge "Add focus outline to AppPairIcon" into main