Merge "Track multiparty conferences" into rvc-dev am: e315ba4934

Change-Id: Ia670f05572a5bd3b3a87ce5db37a3a3538159d2f