Merge "Move Theme Stuff to CtsThemeTestCases" into ics-mr1