Adding support for dynamically resolved default layouts.

issue 14159482
Change-Id: Ic24c5e425cf3e427b82dd13a4a78dd9108174599
7 files changed