Merge "Use the correct targets-per-row count for Landscape." into qt-dev