Merge "Fix libgui tests." into mnc-dev