Merge "Validate content overlay before removal" into tm-dev