Merge "CSD: enable CSD for MMap threads" into udc-dev