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

Change-Id: Ie286b9a16b286fb3f453c8eee0897cce6382ac5b