Merge "Do not seek when switching to background playback" am: 3db1bb97a7
am: 48e2144d15

Change-Id: Ic48fc888b7733bc597f318ac375bd63e122d9feb