Merge "Update correct orientation and layout size" into main