Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 3d75454911 am: 495a9a3816 am: a4bdcf2475 am: 20be866ba8
Change-Id: Ibd9a95eff860c036d69dfee18f099f20060e5c36
This commit is contained in: