Merge "Fix AVRCP crash, position and state tracking"