Merge "Clear separation of RootList Context Menu items and DirList items." into arc-apps