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

Change-Id: I8577f7b46f6c53db78058c759fcfa0905ac73e8f