Merge "Test Aspect Ratio in Different Orientations" into ics-mr1