Merge "Move the cached app high watermark logging before the modern trim flag" into udc-dev