Merge "Revert "Disabled task snapshot for TV"" into oc-dev