Merge "st-hal: restart session if buffering stopped early"