Merge \"Refactor playback position tracking\"
am: 0d83e2969a

Change-Id: I02e4595765448e2b475b7192d8468eb588a774c5