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

Change-Id: I0833a15a8920489d400beda60acbf921ee226c15