Merge "Fix NPE when using "view" tag without class attribute"