Merge "Give ActivityRecordInputSink its own surface"