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

Change-Id: I7f7ba9248fb860fb82522920d9befb443ebea88a