Merge "Use device credential owner as effective user in Credential Interactor" into main