Merge "Update UIEventLogger"