Merge "Avoid seeing ClearAllButton for overview grid's snap position" into sc-v2-dev am: f4afdc4167 am: aa0d699722

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15359119

Change-Id: I5453ca3a176d92bcdf5c77b4e0c0a531a91a8c5b