Merge "Rename hwc-specific methods and properties for readability" into tm-qpr-dev