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

Change-Id: Ice26ae13d3ed8b80ac96b321341f7b68489b2257