Merge "Stable seek bar positioning"
am: 874b481cdf

Change-Id: I86e8607222ab68cbd2999f65f9a382f9b0d02112