Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record"