Merge "Unbreak manual brightness setting."