Merge "Activity recognition source app op tracking" into sc-dev