Merge "Add WindowBuilder NLS support"