Merge "Fix endless looping in layout."