Merge "[Dual Shade] Introduce a shade header that is closer to the UX mocks." into main