Playback & saved states

Change-Id: I6fa2630a58b5c7832918a85ff3cb6a52f1d7fbd5