Merge "Add support for app data accounting for in-kernel dataplanes" into sc-dev