Merge "Revert "Allow theme attributes in <include> tag, fix <tag> context""