Merge "Fix display brightness scaling" into pi-dev