Merge "Fix InsetsConsumer leak" into rvc-dev