Merge "Update ZenModeSettingsTest" into rvc-dev