Merge "Add string for adaptive brightness" into pi-dev