Merge "Audio continue to played even if paused manually" into jb-mr1