Merge "Reset when playback state is NONE, and refactoring" into rvc-dev am:...
Merge "Reset when playback state is NONE, and refactoring" into rvc-dev am: b29c517f am: d80560f0 am: b6ba7d22 am: 07b2603d
Change-Id: Ieabbfed6a8e4d7652cff00c04046491721164a31