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

Change-Id: I049976100806ea78d99bad3201945ceccb0ee8c5