Merge "Add HistoryTracker to FalsingManager"