Merge "[Geofence] Write/read entry value byte count and version number to/from the header block" into main