* commit '633e7a916b48112c0740625829aa8510feab584f': Fix errors that could lead to brightness flickering