Merge "Allow config context to inflate views" into sc-dev