NXP-11509 Skip Folder items and fix cancel actions