Merge "use @SystemAPI for creating UserHandle"