Merge "Add screenrecord to master (emulator)"