Merge "Fix measurement of list with single item" into pi-dev