Merge "[flexiglass] Re-implement ShadeHeader disable in flexiglass" into main