Changed the order of the event properties to better accommodate Android.