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

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

Change-Id: I1731cec05f47525647d898f9e72107905a1cb192