Bring in FileBrowserWidget changes from MoleQueue.

Change-Id: Iecbd08555ecbc095c036499d00019e6e557127f4
Merge topic 'file-browser-widget-sync' into master

e3102196 Bring in FileBrowserWidget changes from MoleQueue.