Merge "hwc: Ensure pipe unset and commit is called correctly" into LA.BR.1.3.6