Merge "screenrecord fixes"