Merge "Buffer at least 2 secs worth of data at startup of after a seek before" into jb-dev