Merge "Fix inflating content views after removal" into rvc-dev