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