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

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

Change-Id: I0fbbb2d708da27c795171baa79e751cc43bb60fc