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

Change-Id: Ic0f4a39ee07ceb42caa41de325c2772400a4427b