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