Merge "Match height for ColorSectionView and WallpaperQuickSwitchView" into main