Merge "Prevent updating of seekbar text when not scrubbing." into tm-dev