Merge "Make the header invisible when customizing" into sc-dev