Merge "Fix issue that the hold label is not shown during remote video holding" am: c1c93761a3 am: 12a51def3c
am: 8e9d052913

Change-Id: Ibe2491faa719e91668cccbdf72a9806d048ca24b