Merge "Update Theme Test HDPI Assets" into ics-mr1