Merge "[bc25] Collapse the shade when switching to bouncer." into main