Merge "DO NOT MERGE Fix failed test case when test on TV" into pie-cts-dev