Merge "ThemeUtils: Retain the original package name in themed UI context" into cm-10.1

Change-Id: I8a4e04eece2d6e700cb43ad7f4f0c052b12b9188