Merge "Handle reperenting of InlineContentView" into rvc-dev