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

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

Change-Id: Iad1bd98ba4fecbb2e23dd3dc366ad0c2b0959a63