Merge "Fix issues with video auto-fullscreen mode." into nyc-mr1-dev am: 43fd36a1b2
am: 9b8e50f60f

* commit '9b8e50f60f8e4f5f73be111f32394b3621ca34f9':
  Fix issues with video auto-fullscreen mode.

Change-Id: I2e033651915875edbf33d6f0f85a293bae16a479