Merge "Flexiglass: fix erroneously-split shade at boot" into main