Merge "Optimize the UI of the PermissionDialog" into rvc-qpr-dev