Revert "ThemeUtils: Retain the original package name in themed UI context"

This reverts commit 2853dae22b0722e26dd2f66bc9134d70a75641ef.