Merge "Prevent BrightnessDialog to finishing twice in test" into main