Merge "Stable seek bar positioning"