Merge "Fix for currency symbol coming from the default locale"