Merge "unregister FileCleanupReceiver when disableHistory"