Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev