Merge "Only run layout if we didn't have content" into pi-dev