the NewFolderButton and SortButton will be shown after cancel selection

[xapool]

I just add code in setupOkButtonVisibility() method to fix that

mToolbar.getMenu().findItem(R.id.new_folder).setVisible(!mIsNewFolderButtonDisabled);
mToolbar.getMenu().findItem(R.id.sort).setVisible(!mIsSortButtonDisabled);