Merge "Allow parameters to be passed into skin tooltip messages"