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