Merge change 6256

* changes:
  Refactoring of VideoView.java class