Merge "Include a delegating container view" into rvc-qpr-dev