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

Change-Id: I872f358ce29f8403fbff52a536fd571900f1e9ec