Merge "Update save app pair icon" into main