Merge changes I231c062e,Idadc42c7

* changes:
  Add external resize tests
  Prevent external frame size changes in two-pass