Merge "[Dual Shade] Minor refactoring of the quick settings shade." into main