Issue 984 - port referrer mapping from Android