Merge changes Ifce81aaa,I4fa80566

* changes:
  Position video overlay only when video is ready
  Reposition draggable div on parent resize