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: I3beed88b592fa84ec52a45dbe9716a9fc3d134b9