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