Merge "Fix zen panel theming" into oc-dr1-dev
am: 1cd7e7a431

Change-Id: I40430a3de3c8866a83a6e160f6a4d2adbd7481d4