Minor UI updates
Minor UI change to only auto-show the keyboard when there is not search text present
Merged in changes from research branch