Merge "Fix to update peer dimensions when video screen resumes foreground" am: 91bf209306 am: ea194aec1e
am: 96026df419

Change-Id: I97e5f8f3dacac16b4a1ae6e5140af486a011372b