Merge "display: update correct BSD license information"