Merge "Inline last call to ShadeViewController.disableHeader" into main