Merge "More work in progress on native events." into gingerbread