Merge "Fix issue that the hold label is not shown during remote video holding"...
Merge "Fix issue that the hold label is not shown during remote video holding" am: c1c93761 am: 12a51def
am: 8e9d0529
Change-Id: Ibe2491faa719e91668cccbdf72a9806d048ca24b