Merge "Revert "Added update device info playback configuration""