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

Change-Id: Id65aff2541601605c4e0e939d1214b525ac3984d