Merge "Fix focus issues in directory fragment * Empty directory view gets...

Merge "Fix focus issues in directory fragment     * Empty directory view gets focus when shown     * Skip opening drawer when showing empty search results     * Fix typo" into nyc-dev
am: f9b78bb6

* commit 'f9b78bb6':
  Fix focus issues in directory fragment     * Empty directory view gets focus when shown     * Skip opening drawer when showing empty search results     * Fix typo