Merge "Update save app pair test to validate when icon chip menu is disabled" into main