Merge "Revert "display: Do not use target names in hw modules""