Merge "[bc25] Reset ShadeSessionStorage when Dual Shade is visible." into main