Merge "Add VR_DISPLAY_MODE settings to be backed up."