Merge "Increase FILTER_COMPLETE_TIMEOUT_MS." into main