With partners, address pull request comments

Addressed every issue in pull request except for addressing the use of
a static variable to store state in ThemeUtils.java