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
am: 5bfded9c

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