Merge "Move zen mode evaluation back into setConfig." into udc-dev