Merge "Update the dismiss reason to be correct when removing via caption menu" into main