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

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