Merge "Revert "Revert "Revert "[hbm] Separate HBM times for multi-display devices.""""