Merge "hwc2: Address remaining review comments"