Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev