Merge "Fixed crash when user handle is null" into main