Merge "Guard CDS settings against USER_NULL" into qt-dev