Merge "Fix null-pointer in EnableZenModeDialog" into rvc-dev