Merge "Add support for partial view layouts"