Merge "Stable seek bar positioning" am: 874b481cdf am: ffb8583a65
am: d87bdf9834

Change-Id: I6c1596594271070901000f68e4500703560f6630