Merge "Updating default layout. (5016381)"