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

Change-Id: I9b6e32b7faa3b72012aeae9cfe23b525a11674f7