Merge "Add constraint layout for landscape and large screen" into main