Merge "Refine FilesAppPerfTest to improve consistency"