Merge "Fix NPE in InlineContentView" into rvc-dev