Merge "Add touches and timestamp to screen recording" into main