Merge "NIU Tooltip : tooltip timer changes"