Merge "Account for header margin depending on which header is selected" into sc-dev am: 2f0c5ac3c8 am: ba637efd62

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

Change-Id: Ibfa3be02f7ab7d1ac1682687a7f4f03fb5578f6e