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