Merge "Setting tooltip gravity to 's' so that the tooltip shows above"