Merge "Fix issue in InsetsState.set" into rvc-dev