Merge "Fix double braceSubstitution of some preview messages"