Apollo: respect shuffle settings when removing track.

Change-Id: I28239da3738ccb0d7675294971266e44fa2a3c5e
Merge branch 'cm-10.2' into martincz