Merge "Do not remove file_cache when exiting demo mode"