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