Merge "Account for header margin depending on which header is selected" into sc-dev