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