Merge changes I79f72bb4,Ic9c10b05 into main

* changes:
  Fix extra erase of 2 output lines when rolling print is still empty
  Intercept stderr as well during rolling output