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

Change-Id: Ib9ccc7b8f8d72bab16ba7b19f1b202aa9f4bba45