Merge "Avoid drawing tall header when scrolling search results" into sc-dev am: 3350508bb6 am: 02567591a5

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

Change-Id: Ide2c03f83d3ec82d927e5d312f1c2129524d3ed1