Merge "Treat the buffering state as playing" into pi-dev