Merge "Fixed cutout not being updated for non hwc layer" into tm-dev