Merge "Fix some issues of the permission dialog" into rvc-dev