Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-dev