[automerger skipped] Merge "Only run layout if we didn't have content" into pi-dev am: 8109960175
am: 450cf9b931  -s ours

Change-Id: Icd42c3a929aa4e9189d205ff165f10886d57a8b0