Merge "Disabled task snapshot for TV" into oc-dev
am: 08b953dd2e

Change-Id: I220460741e82abbfaf3746763cbb4b09e9357965