Merge "Fix horizontal position of tooltip in a Dialog"