Merge "Some fixes related to BrightnessWarningToast" into main