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

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

Change-Id: I57fb6497f07ab77c164dfaf8088e43e3fc36427f