Merge "Updating flag and updating usage of ProcessRecord directly instead of fetching only from targetService" into main