Merge "logd: worst uid record watermark"