Merge "user: Unregister hooks that interfere with unit testing"