Merge "Catch Activity Not Found Exception when switching to specific TV input."