Merge "Make VR brightness adjustable again." into pi-dev
am: 2331a14867

Change-Id: I1507aed6fed121c441d59f2d58c55a88b57f9cbd