and add a mechanism to know that we're in true
initial layout mode

Change-Id: I4ff61160ae67a7ccf1cb8b25c41870c195d32b94