Merge "Measuring the content views always at their specified size" into pi-dev