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

Change-Id: I9b2c30f81a318d58508049fc6fca6d1dcb29fe5f