Merge "Allow null setup activity for TV input" into oc-dev