Changes to trip activity to incorporate the events bag.
Merge remote-tracking branch 'origin/master'