Merge "Update save app pair icon" into 24D1-dev