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

Change-Id: I0af3a3da502c92d89fe56a83c35459460a81e431