BugId: 100516, prevent dropdown from covering the text the user is writing
Merge branch 'BugId-100516' into dev