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

* commit '43fd36a1b2252814c3aa0768d140ede05c84ea16':
  Fix issues with video auto-fullscreen mode.

Change-Id: I898a6d196ebefa98cf690e608acaafa0703c3997