Merge "Fix spot not disappear when display id changed"