Merge "Make dialog not exported" into rvc-qpr-dev