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