Merge "Disabled task snapshot for TV" into oc-dev am: 4cddd9a723
am: 1d3a419358

Change-Id: Idf75e8b7871c6e89ef3dbccf917dd54d3e8575bf