Merge "Fix home key behaviour when there are no subdirs in cwd."