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

This reverts commit 58635f94984d766dbce7870a72ed66e47f19e9cf.