Merge "hwc: Clear overlay and layer-rot map from caller"