Merge "Properly layout InlineContentView" into rvc-dev