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

Change-Id: I80884c58a05783022db3013c683a22efd753a0d7