Merge "LiveSession: re-buffer on under run to avoid stutter" into lmp-dev