Merge "Fix the test application orientation. Bug# 3205196" into gingerbread