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

Change-Id: I421c7bd88c694f569b267e25bf7e7428a4e9d300