Merge "Add default code reviewers in displayservice"