Merge "Fix comparison of UserHandle objects" into rvc-dev