Merge "display: Add a check when registering a client"