Merge "Fixed deletion testcases failures in FileManagementUiTest"