Merge "Fix issues with setRemotePlaybackInfo" into tm-dev