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

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

Change-Id: Idb2c2eea91ecdc9987732a68acbfeea66360977b