Merge "ApiQueryUsers: Add ability to search by user ID"