Merge "Refactor UidPermissionState."