Merge "Make shadeExpansion support all status bar states" into main