Merge remote-tracking branch 'origin/18488' into 18488

diff --cc enyo-client/application/source/en/strings.js
Simple merge

diff --cc enyo-client/application/source/widgets/picker.js
Simple merge

diff --cc lib/enyo-x/source/en/strings.js
index 5a15310,a76fdab..570b68a
--- 1/lib/enyo-x/source/en/strings.js
--- 2/lib/enyo-x/source/en/strings.js
+++ b/lib/enyo-x/source/en/strings.js
@@@ -80,9 -70,8 +80,10 @@@ XT.stringsFor("en_US", 
    "_save": "Save",
    "_saveAndNew": "Save and New",
    "_saving": "Saving",
 +  "_saveFilter": "Save Filter",
 +  "_savedFilters": "Saved Filters",
    "_search": "Search",
+   "_sort": "Sort",
    "_street": "Street",
    "_state": "State",
    "_yes": "Yes",

diff --cc lib/enyo-x/source/less/screen.less
Simple merge

diff --cc lib/enyo-x/source/stylesheets/screen.css
Simple merge

diff --cc lib/enyo-x/source/views/list.js
Simple merge

diff --cc lib/enyo-x/source/views/navigator.js
Simple merge

diff --cc lib/enyo-x/source/views/package.js
Simple merge