Merge "Adjust tooltip layout"