Merge "Update assertion for ContentRecordingController test" into udc-qpr-dev