Merge "Fixes hiding track for quick scrub" into pi-dev
am: 4fb9723faa

Change-Id: I08ceb806a1bd89e8ec58968e06c4aa6286a7baa3