Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews"