Merge "Close gap between grid and clear all for expressive dismiss." into main