Merge "Add landscape support" into sc-dev