Merge "Fix NPEs when display is added or removed"