Merge "Reset when playback state is NONE, and refactoring" into rvc-dev am: b29c517f am: 597a7e94 am: 803d4db5 Change-Id: I618a52c13fbc13171d344203410c3fbcd570f2d4