Merge "Update TV to show custom actions." into oc-dev am: 1a01d1298f
am: 967811616e

Change-Id: I7b89231b51a6a9b40a5c74ff4cdbc4f1eaa5c037