Merge "Apply the latest changes in TV framework for AtscTvInput"