Merge "Fix NPE in empty SizeAdaptiveLayouts."