Merge "Fix DataView focus not updating bug"