Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev