Merge "Don't kill process when overlay changed"