Merge "hwc: Update rotator object handling in error cases"