Merge "Reapply "Finish BrightnessDialog when shade is opened."" into main