Ruih/merge change event and get track by

This is to merge two more upstream WebKit commits.