Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1