Merge "Update libmonet with upstream contrast fixes" into udc-dev