Merge "Added OverrideBrightnessStrategy"