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