Merge "Measuring the content views always at their specified size" into pi-dev am: 13c0e0d19e
am: a499c0060d

Change-Id: I45b130e3bc819394eb58d3b002e32f1f2f88b9a3