Merge change 6817

* changes:
  Fix a problem in VideoView that would cause it to not start playing after prepare.