Merge "Dismiss ScreenRecordDialog when test finishes"