Merge branch 'event_router' into wrt-team_master

Conflicts:
	application/browser/application_service.cc