Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev