Merge "Fix for layout debug mode."