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

Change-Id: I294f8b06ad6b9f51a08ef0f889163a309c955d9e