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

This reverts commit 4ca778c5c51c6707f60c588d20af069194d08352.
Revert "Revert "Revert "Revert "Get theme info for current user instead of user 0""""

This reverts commit 48101729c0bb34eb089c39bd45a5afa796971dd0.