Merge "Always updateRecording in ContentRecordingController#setContentRecordingSession" into udc-qpr-dev