Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2
am: 90f68fdd24
am: 7bc9b3a89a
Change-Id: I777df759200596ff5df38fe22171e1ee24851dd5
This commit is contained in: