Data fields

Fixes for data fields in google analytics
Merge branch 'rr-analyticstracking' into staging
Thank you finalization

Fixes for verbiage, testing on devices
Merge branch 'rr-analyticstracking' into staging