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

Change-Id: I4de52f4ac20c9f9ec99bbc810735e98f1537708e