Merge "Do not show track when scrubing when notification shade is down"