Merge "Optimize the UI of the PermissionDialog" into mainline-prod