Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev