Merge "Fix dialog offset" into rvc-dev