Merge "Fix shell-transit to legacy app-cancel metrics" into sc-v2-dev