Merge "Merge "Revert "Disabled task snapshot for TV"" into oc-dev am: faf86491e9 am: 8212cdfb40"