Merge "Revert "Making mirror slider appear when brightness slider is used in split shade"" into sc-v2-dev