Merge "Fix layout for multi-element rows (e.g. Screenshots)." into tm-qpr-dev