Apollo: respect shuffle settings when removing track

Change-Id: Ia737d18927b5b6d53f1bfdd00ad5fa7b78b65839