Merge "Make VR brightness adjustable again." into pi-dev