Merge "Add settings for altering VR display behavior." into nyc-dev
am: 6ada702

* commit '6ada702993227233fd362e98de93cc9e798dc75d':
  Add settings for altering VR display behavior.

Change-Id: I1816516b1d9c459c0d7bef77c72d9173da7fc3c9