Merge "Fix zen panel theming" into oc-dr1-dev