am 09ae4aef: Merge "Loading internal default layout if partner layout fails to load" into ub-now-queens

* commit '09ae4aef52b4486b97ecc77feeb64307bcbd3993':
  Loading internal default layout if partner layout fails to load