Merge "Music: Play suddenly stopped when playing short music."