Merge changes from topics "cherrypick-device_id_activity-jjzdpul0z9", "cherrypick-recreate-activity" into udc-dev

* changes:
  Don't pass deviceId in ActivityClientRecord
  Update deviceId from server process when activity is destroyed