am dbc46f5e: Merge "Adding support for dynamically resolved default layouts." into ub-now-nova

* commit 'dbc46f5e05d035524eff7fb1ea3ac8681b6b673a':
  Adding support for dynamically resolved default layouts.