Merge "Consolidate the header views updating into a single method" into main