Merge "Remove flag introduce_smoother_dimmer" into main