Merge "Make DND tile primary toggle remember favorite zen" into oc-dev