Merge "Rename hw to displayDevice for consistency"