Merge "More Theme Test Fixes" into ics-mr1