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

Change-Id: I360c924fc3335a72c6cf46b30ee9749838e97433