Merge "Add extra logs for overlay removal" into main