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