Merge "Fixes hiding track for quick scrub" into pi-dev