Merge "New Holo Theme Tests" into ics-mr1