Merge "Use type safe display IDs."