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

Change-Id: I82cd38de1673fc4a12bf4a368f4333ab9ee581a6