Merge "Fix Action Mode close item styling" into nyc-support-25.2-dev