Merge "Fix Yet More Theme Test Stuff" into ics-mr1