Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd32
am: 323f83ef75

Change-Id: If4b5699338640018b9fbb2a636ad33e906404a78