Merge "Fixed screen brightness override in manual mode." into pi-dev